Fix up unix fallout from previous change.

2006-06-08  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkprintoperation-unix.c (finish_print):
	Fix up unix fallout from previous change.

diff --git a/ChangeLog b/ChangeLog
index 188b2a1370c15d6aabd73398f4263568354800d4..ea0e3ce35b26e16790c1b70f09908747350be8a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintoperation-unix.c (finish_print):
+       Fix up unix fallout from previous change.
+
 2006-06-08  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkprintoperation-win32.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 188b2a1370c15d6aabd73398f4263568354800d4..ea0e3ce35b26e16790c1b70f09908747350be8a9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-08  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintoperation-unix.c (finish_print):
+       Fix up unix fallout from previous change.
+
 2006-06-08  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkprintoperation-win32.c:

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 46ce889be9073b66b0990566b40808778c9e5ad3..e87927a8066480c156722f26c99bed120fa62e88 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -177,7 +177,7 @@ _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op,
   GdkScreen *screen;
   GError *error = NULL;
 
-  cairo_surface_destroy (pop->surface);
+  cairo_surface_destroy (surface);
  
   settings = gtk_settings_get_default ();
   g_object_get (settings, "gtk-print-preview-command", &preview_cmd, NULL);
@@ -438,7 +438,7 @@ finish_print (PrintResponseData *rdata,
     } 
  out:
   if (rdata->print_cb)
-    rdata->print_cb (op, rdata->do_print, rdata->parent, rdata->result); 
+    rdata->print_cb (op, rdata->parent, rdata->do_print, rdata->result); 
 
   if (rdata->destroy)
     rdata->destroy (rdata);